Auto merge of #2045 - zv:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 9 Oct 2015 16:36:30 +0000 (16:36 +0000)
committerbors <bors@rust-lang.org>
Fri, 9 Oct 2015 16:36:30 +0000 (16:36 +0000)
commit1e97e2dde37b20cf47bd574e5f86133c687b4e91
treeb0f46de4bdd80579883345f104c6a13d549a9c9b
parent94a5b9bf30b1b6f8e7af1aee7043d7e2148a82c5
parenta0d687c1ef1b61a5caaa6015260bb61e76f050a2
Auto merge of #2045 - zv:master, r=alexcrichton

This pull request fixes two distinct issues with the `_cargo` compdef:

- Tab-completion should supply `--color=` options (`none`, `auto`, and `always`)
- Updates the deprecated "command scope flags" which now have a single, unambiguous representative variable which provides the appropriate exclusivity between options.